Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Sun, 25 Apr 2010 00:34:50 +0000 (02:34 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 25 Apr 2010 00:34:50 +0000 (02:34 +0200)
commitcc2cc104f9b1addb0b00b4f97de3f156468dfbfb
tree190fb7a7998377cd3dfb55ad56fb6c208a681afb
parent8a12e342f50872717d0299e7dd27e2c91b621d36
parent02cb2ca3845bd9e894977051b994057dcc931c32
Merge remote branch 'origin/upstream-cvs' into upstream